Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 10:24:14 +0000 (10:24 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 10:24:14 +0000 (10:24 +0000)

Trivial merge